Repository navigation
Calendar: a Repeat field instead of recurrence JSON (#1801) - #1896
Closed
michielbdejong wants to merge 4 commits into
Closed
michielbdejong wants to merge 4 commits into
michielbdejong wants to merge 4 commits into
Conversation
The row dialog opened from a calendar view shows a Repeat field instead of the raw recurrence JSON: none, daily, weekly on chosen days, monthly by date or nth weekday, or yearly, ending never, on a date or after N times, with a summary in words. It writes the payload the view already expands; a payload it cannot show reads as Custom, kept as is, with its JSON one click away. A table without a recurrence property gets one (shortname atomic-calendar-recurrence, as in the Event ontology) when a row first repeats. A row's own series (calendarId "atomic") follows the row's date columns, so moving the row moves the series; imported payloads stay the provider's. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A Playwright test makes an event repeat weekly from the row dialog and checks it appears on the following weeks. The Custom hint moves into its own component: inside its guard the extractor dropped it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Setting undefined through Resource.set failed validation, so turning a repeat off raised an error. Remove the value instead. The e2e test now turns the repeat off again. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Sep 29, 2026
Contributor
Author
|
Michiel's decisions:
|
The table view's row dialog now shows the calendar's Repeat field for the recurrence property instead of its raw JSON, with the JSON behind Show JSON. It uses the calendar's detection (`atomic-calendar-recurrence` or the imported `lt-google-calendar-property-` one) and repeats from the calendar's Day, else the class's first date column. A table creates no property: a class without a recurrence or date column, or a row without a day, keeps the JSON editor. The recurrence cell shows the Repeat summary, read-only. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Member
|
Trekmeester review (not batched tonight; this needs maintainer sign-off): it introduces a stored native recurrence payload ( |
joepio
added a commit
that referenced
this pull request
Oct 5, 2026
… chat, search, CI) (#2060) Combines #1530, #1638, #1663, #1835, #1869, #1896, #1898, #1911, #1912, #1913, #1914, #1918, #1919, #1929, #1931, #1949, #1958, #1959, #1961, #1963, #1968, #1975, #1981, #1985, #1988, #2038, #2041, #2047 and #2050, tested in one full Mancave run on the exact head (run 4999, green).
Member
|
Landed on develop in the combined batch #2060 (95707c0), tested together in one full run. Closing as included. Generated by Claude Code |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #1801
Decision (Michiel, 25 Sep): Atomic's own calendar gets a native "repeat" setting.
What changes
The row dialog opened from a calendar view has a Repeat section above the other fields, in place of the raw
RecurrenceJSON:Table view (decided by Michiel)
The table view's row dialog shows the same Repeat field (summary, options, Custom with Show JSON) in place of the Recurrence JSON, and the Recurrence cell shows the summary ("Every Tuesday, 10 times"), read-only; editing the cell still opens the JSON editor. Same detection as the calendar (
useCalendarRecurrenceProp); the series repeats from the calendar's Day column, else the class's first date column. Unlike the calendar, the table creates no property: a class without a recurrence or date column, or a row without a day, keeps the JSON editor. New:Calendar/useTableCalendarRow.ts,Calendar/RepeatSummaryCell.tsx.Where it is stored
@tomic/libcalendar-recurrence.ts), in the property with shortnameatomic-calendar-recurrence(the same one the atomic-plugins Event ontology defines; importedlt-google-calendar-property-ones still match).createPropertyOnClass, now with an optionalshortname).{ calendarId: "atomic", event: { id, start, end, recurrence: ["RRULE:…"] } }. The view fillsid/start/endfrom the row's current columns and re-anchors the rule, so moving the row moves the series (a weekly series on its start's weekday follows it to the new weekday). Imported payloads (any othercalendarId) stay the provider's, as before, and still only apply where the view is placed byatomic-calendar-day; native series work on any date column (e.g. an Issue Tracker's auto-created "Date").New:
browser/lib/src/calendar-repeat.ts(model ⇄ RRULE),Calendar/RepeatField.tsx,CalendarRowFields.tsx,calendarRows.ts,repeatSummary.ts,useCalendarRecurrenceProp.ts.Tests
lib/src/calendar-repeat.test.ts: build → parse round trips for every option (all-day and timed), timed UNTIL at end of day in the event's zone, "last" weekday, other calendars' spellings, 16 Custom fallbacks, and that a native payload expands on the following weeks.Calendar/repeatSummary.test.ts: the summary text for every option, "Does not repeat" and "Custom".Calendar/calendarRows.test.ts: a moved row takes its series along; imported payloads untouched; custom kept.Calendar/RepeatField.test.tsx(component): choosing Weekly; Custom with Show JSON.TablePage/ExpandedRowDialog.test.tsx(component): the table row dialog shows the Repeat field for a recurrence property and hides its JSON; choosing Weekly writes the samenativeCalendarPayloadthe calendar writes; a row without a day and a class without a recurrence property keep the JSON; the cell shows the summary.e2e/tests/calendar.spec.ts› calendar repeat: sets Repeat to Weekly in the dialog and checks the event on the next three weeks and not the day after, then sets "Does not repeat" and checks the series is gone.Screenshots
Before / after, desktop and 375 px (Europe/Amsterdam, en-GB), shared with the developer in chat:
1801-before-dialog-{desktop,375}.png,1801-before-calendar-{desktop,375}.png,1801-after-1801-dialog-{desktop,375}.png,1801-after-1801-calendar-{desktop,375}.png. Table view:1801-table-dialog-{desktop,375}.png,1801-table-dialog-375-json.png,1801-table-grid.png.Questions for Michiel
The table view's row dialog: decided, it gets the same Repeat field (see above).🤖 Generated with Claude Code